diff --git a/lib/addevent.dart b/lib/addevent.dart
index c1cde5ab41aebd520e6e33063b4ca8831fa458a2..242ce79f1fa77c1a1697ae644a26224b54a4ae88 100644
--- a/lib/addevent.dart
+++ b/lib/addevent.dart
@@ -8,7 +8,6 @@ import 'datamodel.dart';
 import 'databaseconnector.dart';
 import 'dart:async';
 import 'package:geolocator/geolocator.dart';
-import 'package:shared_preferences/shared_preferences.dart';
 
 class AddEvent extends StatefulWidget {
   const AddEvent({Key? key}) : super(key: key);
diff --git a/lib/configuration.dart b/lib/configuration.dart
index 3cc0ac83ef2b4fc7ef61f0298a25f191f54586fc..45b08adb81c5198b00446c9ded51474ba6ec0c35 100644
--- a/lib/configuration.dart
+++ b/lib/configuration.dart
@@ -5,7 +5,6 @@ import 'package:flutter/services.dart';
 import 'datamodel.dart';
 import 'sensorconnector.dart';
 import 'databaseconnector.dart';
-import 'package:shared_preferences/shared_preferences.dart';
 import 'package:path/path.dart';
 import 'package:path_provider/path_provider.dart';
 
diff --git a/lib/databaseconnector.dart b/lib/databaseconnector.dart
index 9d2c46d499b88f96fb80678d6d043e6bdf26b859..96a6ff40ee4bcea12615aa61d7f42e01fb2bac2e 100644
--- a/lib/databaseconnector.dart
+++ b/lib/databaseconnector.dart
@@ -1,5 +1,4 @@
 import 'dart:convert';
-
 import 'package:sqflite/sqflite.dart';
 import 'package:path/path.dart';
 import 'dart:async';
diff --git a/lib/datamodel.dart b/lib/datamodel.dart
index b9488bd343139c33f702fce45f12f7c8704ffc5a..dfa5a21b5e8bba759317dbaacd1a7ff7bc9535cc 100644
--- a/lib/datamodel.dart
+++ b/lib/datamodel.dart
@@ -1,6 +1,4 @@
-
 import 'dart:convert';
-
 import 'package:flutter/cupertino.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
diff --git a/lib/main.dart b/lib/main.dart
index f4f1bba1af5bfbe65d3d762e1e71b5f9e83c116f..77b0403d40a27fb7969e5adfa334845dc41aeb5f 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -1,6 +1,4 @@
-import 'dart:convert';
 import 'package:flutter/material.dart';
-import 'package:shared_preferences/shared_preferences.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'datamodel.dart';
 import 'addevent.dart';
@@ -14,7 +12,7 @@ Future<void> loadConfiguration() async {
   final EventStoreInstance event = EventStoreInstance();
   WidgetsFlutterBinding.ensureInitialized();
 
-
+  // Load conf and last event fields from shared preferences to prefill UI
   await configuration.loadFromSharedPrefs();
   await event.loadFromSharedPrefs();
 
@@ -25,21 +23,13 @@ Future<void> loadConfiguration() async {
 
   var database = DatabaseInstance();
   await database.connect();  //Do once at start of APP!
-
-  //TODO: there should be a loading screen until configuration is loaded and database connection is established.
 }
 
 void main() {
   loadConfiguration();
 
-  EventStoreInstance events = EventStoreInstance();
-  final ConfigurationStoreInstance configuration = ConfigurationStoreInstance();
-
-  //Reset old data
-  events.reset();  // TODO: load configuration and events from shared preferences.
-  configuration.reset();
 
-  configuration.loginInformation = SensorLogin.fromJson({"mail":"admin","password":"adminadmin"}); //TODO: replace for productive version.
+  //configuration.loginInformation = SensorLogin.fromJson({"mail":"admin","password":"adminadmin"}); //TODO: replace for productive version.
 
   runApp(MaterialApp(
     title: 'Mobile Event Log',