diff --git a/lib/globals.dart b/lib/globals.dart
index eb199e797e30e08031584f37a312ee60d0fdea8e..b05b616bedd47a40b2c6531c953ac310064bfed8 100644
--- a/lib/globals.dart
+++ b/lib/globals.dart
@@ -5,16 +5,11 @@ import 'package:gecko/models/g1_wallets_list.dart';
 import 'package:gecko/models/wallet_data.dart';
 import 'package:hive_flutter/hive_flutter.dart';
 import 'package:logger/logger.dart';
-import 'package:shared_preferences/shared_preferences.dart';
 
 // Version of box data
 const int dataVersion = 4;
 
-// Files paths
-Directory? appPath;
-
 late String appVersion;
-late SharedPreferences prefs;
 const int pinLength = 5;
 const String appLang = 'english';
 
diff --git a/lib/main.dart b/lib/main.dart
index a7262ebfed0d20c65cb87d0058a509cab097cfb7..09845058cee2e69cbcde506e4d7e5d73ae008630 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -41,7 +41,6 @@ import 'package:hive_flutter/hive_flutter.dart';
 import 'package:provider/provider.dart';
 import 'package:flutter/foundation.dart';
 import 'package:responsive_framework/responsive_framework.dart';
-import 'package:shared_preferences/shared_preferences.dart';
 import 'package:sentry_flutter/sentry_flutter.dart';
 import 'package:graphql_flutter/graphql_flutter.dart';
 import 'package:easy_localization/easy_localization.dart';
@@ -61,7 +60,6 @@ Future<void> main() async {
   await initHiveForFlutter();
   await homeProvider.initHive();
   appVersion = await homeProvider.getAppVersion();
-  prefs = await SharedPreferences.getInstance();
 
   // Reset GraphQL cache
   // final cache = HiveStore();
diff --git a/lib/models/queries_indexer.dart b/lib/models/queries_indexer.dart
index 25483cb199ba13e9035777c1e5f4dfe6143b1a03..607db4d9a9fb2c83c589845873b58c930faf061e 100644
--- a/lib/models/queries_indexer.dart
+++ b/lib/models/queries_indexer.dart
@@ -18,40 +18,6 @@ query ($name: String!) {
 ''';
 
 const String getHistoryByAddressQ = r'''
-query ($address: String!) {
-  account_by_pk(id: "5CQ8T4qpbYJq7uVsxGPQ5q2df7x3Wa4aRY6HUWMBYjfLZhnn") {
-    transactions_issued {
-      receiver_id
-      amount
-      created_at
-      created_on
-    }
-    transactions_received {
-      issuer_id
-      amount
-      created_at
-      created_on
-    }
-  }
-}
-''';
-
-const String getHistoryByAddressQ2 = r'''
-query ($address: String!) {
-  {
-    transaction(where: {_or: [{issuer_id: {_eq: $address}}, 
-      {receiver_id: {_eq: $address}}]}, order_by: {created_at: desc})
-  {
-      amount
-      created_at
-      issuer_id
-      receiver_id
-    }
-  }
-}
-''';
-
-const String getHistoryByAddressQ3 = r'''
 query ($address: String!, $number: Int!, $cursor: String) {
   transaction_connection(where: 
   {_or: [
diff --git a/lib/providers/home.dart b/lib/providers/home.dart
index 4fadc5ae21ea1e7c9de9f2b4087853820ac6eb81..8d6204041263d231baf62355bc29f49e59653bb8 100644
--- a/lib/providers/home.dart
+++ b/lib/providers/home.dart
@@ -231,24 +231,3 @@ class HomeProvider with ChangeNotifier {
     notifyListeners();
   }
 }
-
-class CustomRoundedButton extends CustomPainter {
-  @override
-  void paint(Canvas canvas, Size size) {
-    Paint paint = Paint()
-      ..color = yellowC
-      ..style = PaintingStyle.fill;
-    Path path = Path();
-    path.lineTo(size.width * 0.4, 0);
-    path.quadraticBezierTo(size.width * 0.5, -40, size.width * 0.6, 0);
-    path.lineTo(size.width, 0);
-    path.lineTo(size.width, size.height);
-    path.lineTo(0, size.height);
-    canvas.drawPath(path, paint);
-  }
-
-  @override
-  bool shouldRepaint(covariant CustomPainter oldDelegate) {
-    return false;
-  }
-}
diff --git a/lib/providers/substrate_sdk.dart b/lib/providers/substrate_sdk.dart
index bd519854e4152209aaccfffd4ce8c482b8e640a5..497d5409929477f7db600ee43180bad7182b6f96 100644
--- a/lib/providers/substrate_sdk.dart
+++ b/lib/providers/substrate_sdk.dart
@@ -980,19 +980,6 @@ newKeySig: $newKeySig""");
 /////// 6: UI ELEMENTS (off class) /////////
 ////////////////////////////////////////////
 
-void snack(BuildContext context, String message, {int duration = 2}) {
-  final snackBar =
-      SnackBar(content: Text(message), duration: Duration(seconds: duration));
-  ScaffoldMessenger.of(context).showSnackBar(snackBar);
-}
-
-class AddressInfo {
-  final String? address;
-  double balance;
-
-  AddressInfo({@required this.address, this.balance = 0});
-}
-
 void snackNode(BuildContext context, bool isConnected) {
   String message;
   if (!isConnected) {
@@ -1018,11 +1005,6 @@ String getShortPubkey(String pubkey) {
   return pubkeyShort;
 }
 
-class PasswordException implements Exception {
-  String cause;
-  PasswordException(this.cause);
-}
-
 Uint8List _int32bytes(int value) =>
     Uint8List(4)..buffer.asInt32List()[0] = value;
 
diff --git a/lib/screens/activity.dart b/lib/screens/activity.dart
index f8c44ae70441024c676b5729d6dba8496a83fb83..1eb8ba291380f3e9a38d1a15c4b5c67899e1e839 100644
--- a/lib/screens/activity.dart
+++ b/lib/screens/activity.dart
@@ -89,7 +89,7 @@ class ActivityScreen extends StatelessWidget with ChangeNotifier {
         children: <Widget>[
           Query(
             options: QueryOptions(
-              document: gql(getHistoryByAddressQ3),
+              document: gql(getHistoryByAddressQ),
               variables: <String, dynamic>{
                 'address': address,
                 'number': 20,
diff --git a/lib/screens/avatar_fullscreen.dart b/lib/screens/avatar_fullscreen.dart
deleted file mode 100644
index ef87be1281147f8fa2f95d698ecf375507351ec9..0000000000000000000000000000000000000000
--- a/lib/screens/avatar_fullscreen.dart
+++ /dev/null
@@ -1,49 +0,0 @@
-import 'package:flutter/services.dart';
-import 'package:gecko/globals.dart';
-import 'package:flutter/material.dart';
-
-class AvatarFullscreen extends StatelessWidget {
-  const AvatarFullscreen(this.avatar, {this.title, this.color, Key? key})
-      : super(key: key);
-  final Image? avatar;
-  final String? title;
-  final Color? color;
-
-  @override
-  Widget build(BuildContext context) {
-    SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
-    // HomeProvider _homeProvider = Provider.of<HomeProvider>(context);
-    return Scaffold(
-      appBar: AppBar(
-          elevation: 0,
-          backgroundColor: color ?? Colors.black,
-          toolbarHeight: 60 * ratio,
-          leading: IconButton(
-              icon: Icon(Icons.arrow_back, color: orangeC),
-              onPressed: () {
-                Navigator.pop(context);
-              }),
-          title: SizedBox(
-            height: 22,
-            child: Text(
-              title ?? 'Photo de profil',
-              style: TextStyle(color: orangeC),
-            ),
-          )),
-      body: SafeArea(
-        child: SizedBox.expand(
-          child: Container(
-            color: color ?? Colors.black,
-            // alignment: Alignment.center,
-            // height: MediaQuery.of(context).size.height,
-            // width: MediaQuery.of(context).size.width,
-            child: Image(
-                image: avatar!.image,
-                height: avatar!.height,
-                fit: BoxFit.fitWidth),
-          ),
-        ),
-      ),
-    );
-  }
-}
diff --git a/lib/screens/myWallets/transaction_comment.dart b/lib/screens/myWallets/transaction_comment.dart
deleted file mode 100644
index 7312324f7d7f19e121ba853d02163152ce7a2f46..0000000000000000000000000000000000000000
--- a/lib/screens/myWallets/transaction_comment.dart
+++ /dev/null
@@ -1,46 +0,0 @@
-// ignore_for_file: must_be_immutable
-
-import 'package:easy_localization/easy_localization.dart';
-import 'package:flutter/services.dart';
-import 'package:gecko/globals.dart';
-import 'package:flutter/material.dart';
-// import 'package:gecko/models/home.dart';
-// import 'package:provider/provider.dart';
-
-class TransactionCommentScreen extends StatelessWidget {
-  TextEditingController tplController = TextEditingController();
-
-  TransactionCommentScreen({Key? key}) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
-    // HomeProvider _homeProvider = Provider.of<HomeProvider>(context);
-    return Scaffold(
-        appBar: AppBar(
-          toolbarHeight: 60 * ratio,
-          title: SizedBox(
-            height: 22,
-            child: Text('confirmPayment'.tr()),
-          ),
-        ),
-        body: SafeArea(
-          child: Column(children: <Widget>[
-            const SizedBox(height: 20),
-            TextField(
-                enabled: true,
-                controller: tplController,
-                maxLines: 1,
-                textAlign: TextAlign.center,
-                decoration: const InputDecoration(
-                  contentPadding: EdgeInsets.all(15.0),
-                ),
-                style: const TextStyle(
-                    fontSize: 22.0,
-                    color: Colors.black,
-                    fontWeight: FontWeight.w400)),
-            const SizedBox(height: 20),
-          ]),
-        ));
-  }
-}
diff --git a/lib/screens/onBoarding/6.dart b/lib/screens/onBoarding/6.dart
index 8e3a62436a65afd911f0bc344940ddc8ae6a6ddb..c5e88916aad6ce540de078d609b37e5e84a01ebe 100644
--- a/lib/screens/onBoarding/6.dart
+++ b/lib/screens/onBoarding/6.dart
@@ -144,76 +144,6 @@ class OnboardingStepSix extends StatelessWidget {
   }
 }
 
-Widget sentanceArray(BuildContext context) {
-  GenerateWalletsProvider generateWalletProvider =
-      Provider.of<GenerateWalletsProvider>(context);
-
-  return Padding(
-    padding: const EdgeInsets.symmetric(horizontal: 3),
-    child: Container(
-      constraints: const BoxConstraints(maxWidth: 450),
-      decoration: BoxDecoration(
-          border: Border.all(color: Colors.black),
-          color: const Color(0xffeeeedd),
-          borderRadius: const BorderRadius.all(
-            Radius.circular(10),
-          )),
-      padding: const EdgeInsets.all(20),
-      child: FutureBuilder(
-          future: generateWalletProvider.generateWordList(context),
-          builder: (BuildContext context, AsyncSnapshot<List> data) {
-            if (!data.hasData) {
-              return const Text('');
-            } else {
-              return Column(
-                  mainAxisAlignment: MainAxisAlignment.center,
-                  mainAxisSize: MainAxisSize.max,
-                  crossAxisAlignment: CrossAxisAlignment.center,
-                  children: <Widget>[
-                    Row(children: <Widget>[
-                      arrayCell(data.data![0]),
-                      arrayCell(data.data![1]),
-                      arrayCell(data.data![2]),
-                      arrayCell(data.data![3]),
-                    ]),
-                    const SizedBox(height: 15),
-                    Row(children: <Widget>[
-                      arrayCell(data.data![4]),
-                      arrayCell(data.data![5]),
-                      arrayCell(data.data![6]),
-                      arrayCell(data.data![7]),
-                    ]),
-                    const SizedBox(height: 15),
-                    Row(children: <Widget>[
-                      arrayCell(data.data![8]),
-                      arrayCell(data.data![9]),
-                      arrayCell(data.data![10]),
-                      arrayCell(data.data![11]),
-                    ]),
-                  ]);
-            }
-          }),
-    ),
-  );
-}
-
-Widget arrayCell(dataWord) {
-  return SizedBox(
-    width: 100,
-    child: Column(children: <Widget>[
-      Text(
-        dataWord.split(':')[0],
-        style: const TextStyle(fontSize: 15, color: Color(0xff6b6b52)),
-      ),
-      Text(
-        dataWord.split(':')[1],
-        key: keyMnemonicWord(dataWord.split(':')[0]),
-        style: const TextStyle(fontSize: 20, color: Colors.black),
-      ),
-    ]),
-  );
-}
-
 Widget nextButton(BuildContext context, String text, nextScreen, bool isFast) {
   GenerateWalletsProvider generateWalletProvider =
       Provider.of<GenerateWalletsProvider>(context, listen: false);