diff --git a/scripts/b-i-setup-fs b/scripts/b-i-setup-fs
index 5d3e48b..0b4b26a 100644
--- a/scripts/b-i-setup-fs
+++ b/scripts/b-i-setup-fs
@@ -76,7 +76,8 @@ do_chroot /usr/bin/apt-get --yes clean
 
 read AUTOLOGIN USERNAME < $ROOTFS/tmp/user-setup
 echo "Configuring user $USERNAME"
-echo "Auto-login: $AUTOLIGIN"
+rm -f $ROOTFS/tmp/user-setup
+
 
 # This is the original group used in full ISO of BlankOn, since the current ISO generate the minimum packages,
 # some groups doesnt exist.
@@ -87,10 +88,12 @@ do_chroot /usr/sbin/useradd -G $USER_GROUPS -m -s /bin/bash $USERNAME
 
 do_chroot /usr/sbin/chpasswd $USERNAME < $ROOTFS/tmp/user-pass
 do_chroot /usr/bin/chfn < $ROOTFS/tmp/user-info
+rm -f $ROOTFS/tmp/user-pass
 
 if [ -f /tmp/root-pass ];
 then
     do_chroot /usr/sbin/chpasswd root < $ROOTFS/tmp/root-pass
+    rm -f $ROOTFS/tmp/root-pass
 fi
 
 ###### CUSTOM GROUP