diff --git a/README.md b/README.md
index 23c46a7..c8273f2 100644
--- a/README.md
+++ b/README.md
@@ -34,4 +34,4 @@ This parameter can be ```True``` or ```False```. It enables or disables the self
 
 ## Usage
 ### Actionabr
-You might want to add the user actions by calling ```users.context.menubar(bar, request)``` with ```bar``` as actionbar. See theme dosumentation for more details.
+You might want to add the user actions by calling ```users.context.menubar(bar, request)``` with ```bar``` as menubar. See theme dosumentation for more details.
diff --git a/parameter.py b/parameter.py
index 59b3587..a478afa 100644
--- a/parameter.py
+++ b/parameter.py
@@ -2,14 +2,11 @@ import config
 from django.conf import settings
 
 USERS_SELF_REGISTRATION = "USERS_SELF_REGISTRATION"
-# TODO: Implement or find the mail validation and the methods to ask for the user status
 # USERS_MAIL_VALIDATION = "USERS_MAIL_VALIDATION"
-# TODO: Implement or mail information (Admins: New Useraccounts, Failed logins; User: Password Change, ...)
 # USERS_MAIL_INFORMATION = "USERS_MAIL_INFORMATION"
 
 
 DEFAULTS = {
-    # TODO: Implement the parameer functionality USERS_SELF_REGISTRATION
     USERS_SELF_REGISTRATION: False,
     # USERS_MAIL_VALIDATION: True,
     # USERS_MAIL_INFORMATION: True,
diff --git a/views.py b/views.py
index 52852b2..1d0efa0 100644
--- a/views.py
+++ b/views.py
@@ -15,8 +15,6 @@ from themes import Context
 import users
 from users import parameter
 
-# TODO: Implement password change.
-
 try:
     from config import APP_NAME as ROOT_LOGGER_NAME
 except ImportError:
@@ -25,7 +23,6 @@ logger = logging.getLogger(ROOT_LOGGER_NAME).getChild(__name__)
 
 
 def password_recovery(request):
-    # TODO: Implement password recovery
     messages.error(request, "Password recovery is not yet implemented!")
     return redirect(request.GET.get('next') or '/')