diff --git a/PROTOTYPE AREA (future stuff and etc...)/NewConfiguration/forcedActions.yml b/PROTOTYPE AREA (future stuff and etc...)/NewConfiguration/actions.yml
similarity index 100%
rename from PROTOTYPE AREA (future stuff and etc...)/NewConfiguration/forcedActions.yml
rename to PROTOTYPE AREA (future stuff and etc...)/NewConfiguration/actions.yml
diff --git a/PROTOTYPE AREA (future stuff and etc...)/NewConfiguration/advanced.yml b/PROTOTYPE AREA (future stuff and etc...)/NewConfiguration/advanced.yml
index 5493ecd69..a432ec9c3 100644
--- a/PROTOTYPE AREA (future stuff and etc...)/NewConfiguration/advanced.yml	
+++ b/PROTOTYPE AREA (future stuff and etc...)/NewConfiguration/advanced.yml	
@@ -17,9 +17,6 @@ sessionLogin:
     sessionExpireOnIpChange: true
 
 security:
-    # Should players in the OP list have every permissions?
-    opPermissions: true
-    
     # Online players aren't kicked out for "Logged in from another location!", this option should always be set to true!
     forceSingleSession: true
     # Should we display all other accounts from a player when he joins?
diff --git a/PROTOTYPE AREA (future stuff and etc...)/NewConfiguration/database.yml b/PROTOTYPE AREA (future stuff and etc...)/NewConfiguration/database.yml
index 6a8855997..6c26091b4 100644
--- a/PROTOTYPE AREA (future stuff and etc...)/NewConfiguration/database.yml	
+++ b/PROTOTYPE AREA (future stuff and etc...)/NewConfiguration/database.yml	
@@ -1,7 +1,6 @@
 #  Database AuthMeReloaded configuration file
 
 # What type of database do you want to use? Avariable options: sqlite, mysql, redis
-# (The old flatfile backend is now deprecated, if you set this option to 'file' the 'file to SQLite' converter will be executed!)
 backend: sqlite
 # Do you like to cache all the queries? (Performance Boost)
 caching: true
@@ -12,6 +11,7 @@ databaseName: authme
 tableName: authme
 
 # MySql Database connection settings
+# Avariable only if the AuthMeReloaded-Mysql module is installed!
 mysql:
     port: '3306'
     host: 127.0.0.1
@@ -19,6 +19,7 @@ mysql:
     password: '12345'
 
 # Redis Database connection settings
+# Avariable only if the AuthMeReloaded-Redis module is installed!
 redis:
     # Get Redis from http://redis.io/
     host: 127.0.0.1
diff --git a/PROTOTYPE AREA (future stuff and etc...)/NewConfiguration/emailSystem.yml b/PROTOTYPE AREA (future stuff and etc...)/NewConfiguration/email.yml
similarity index 100%
rename from PROTOTYPE AREA (future stuff and etc...)/NewConfiguration/emailSystem.yml
rename to PROTOTYPE AREA (future stuff and etc...)/NewConfiguration/email.yml
diff --git a/PROTOTYPE AREA (future stuff and etc...)/NewConfiguration/general.yml b/PROTOTYPE AREA (future stuff and etc...)/NewConfiguration/general.yml
index c1d290c2c..48931ea49 100644
--- a/PROTOTYPE AREA (future stuff and etc...)/NewConfiguration/general.yml	
+++ b/PROTOTYPE AREA (future stuff and etc...)/NewConfiguration/general.yml	
@@ -67,8 +67,6 @@ password:
     # When it's true, registration require that kind of command:
     # /register <password> <confirmPassword>
     doublePasswordCheck: true
-    # Should players can use their usernames as passwords?
-    allowNameAsPassword: false
     # Deny unsafe passwords for being used, put them on lowercase!
     unsafePasswords:
     - '123456'