diff --git a/fs/opt/groomer/groomer.sh b/fs/opt/groomer/groomer.sh
index ddaaf9a..32a8d50 100755
--- a/fs/opt/groomer/groomer.sh
+++ b/fs/opt/groomer/groomer.sh
@@ -107,19 +107,6 @@ do
 
         main ${target_dir}
 
-        #if [ $COPYDIRTYPDF -eq 1 ]; then
-        #    pdfCopyDirty ${SRC} $targetDir
-        #else
-        #    pdfCopyClean ${SRC} $targetDir
-        #fi
-
-        # copy stuff
-        #copySafeFiles ${SRC} $targetDir
-        #convertCopyFiles ${SRC} $targetDir $TEMP
-        #rm -rf ${TEMP}/*
-
-        # unpack and process archives
-        #unpackZip ${SRC} $targetDir $TEMP
         ls -lR "${target_dir}"
     fi
     let PARTCOUNT=`expr $PARTCOUNT + 1`
diff --git a/fs/opt/groomer/init.sh b/fs/opt/groomer/init.sh
index 59e1141..a03fdfb 100755
--- a/fs/opt/groomer/init.sh
+++ b/fs/opt/groomer/init.sh
@@ -14,7 +14,6 @@ clean(){
     echo Done, cleaning.
     #mount -o remount,rw /
     ${SYNC}
-    # shutdown -h now
 }
 
 trap clean EXIT TERM INT
@@ -22,8 +21,8 @@ trap clean EXIT TERM INT
 # Remount the root filesystem in RO mode
 #mount -o remount,ro /
 
-chown -R kitten:kitten /home/${USERNAME}/
+chown -R ${USERNAME}:${USERNAME} /home/${USERNAME}/
 
-su  ${USERNAME} -c ./groomer.sh
+su ${USERNAME} -c ./groomer.sh