diff --git a/lynis b/lynis
index 3ca57f7d..c67b4ac1 100755
--- a/lynis
+++ b/lynis
@@ -6,7 +6,7 @@
 # ------------------
 #
 # Copyright 2007-2015 Michael Boelen, CISOfy (michael.boelen@cisofy.com)
-# Website: https://cisofy.com
+# Web site: https://cisofy.com
 #
 # Lynis comes with ABSOLUTELY NO WARRANTY. This is free software, and you are
 # welcome to redistribute it under the terms of the GNU General Public License.
@@ -23,7 +23,7 @@
     # Program information
     PROGRAM_name="Lynis"
     PROGRAM_version="2.1.1"
-    PROGRAM_releasedate="27 May 2015"
+    PROGRAM_releasedate="22 July 2015"
     PROGRAM_author="CISOfy"
     PROGRAM_author_contact="lynis-dev@cisofy.com"
     PROGRAM_website="https://cisofy.com"
@@ -305,10 +305,10 @@
         echo "      ${YELLOW}Note: ${WHITE}Cancelling the program can leave temporary files behind${NORMAL}"
         echo ""
         wait_for_keypress
+        # Deleting temporary files
+        # Note: Display function does not work yet at this point
         if [ -f lynis.pid ]; then rm -f lynis.pid; fi
         if [ -f /var/run/lynis.pid ]; then rm -f /var/run/lynis.pid; fi
-        #YYY Display function not working yet from here, due to OS detection
-        #Display --indent 2 --text "- Deleting old PID file..." --result DONE --color GREEN
     fi
 
     # Create new PID file (use work directory if /var/run is not available)
@@ -499,7 +499,6 @@
         echo "  Report file:               ${REPORTFILE}"
         echo "  Report version:            ${REPORT_version}"
         echo "  Plugin directory:          ${PLUGINDIR}"
-        #echo "  Database directory:        ${DBDIR}"
         echo "  ---------------------------------------------------"
     fi
 
@@ -522,9 +521,7 @@
     logtext "-----------------------------------------------------"
     logtext "Include directory:         ${INCLUDEDIR}"
     logtext "Plugin directory:          ${PLUGINDIR}"
-    logtext "Database directory:        ${DBDIR}"
     logtextbreak
-    #wait_for_keypress
 
 #
 #################################################################################