diff --git a/xbps-src b/xbps-src
index 224e652675..2576239320 100755
--- a/xbps-src
+++ b/xbps-src
@@ -281,14 +281,6 @@ masterdir_zap() {
 
 exit_func() {
     wait
-    if [ -z "$XBPS_KEEP_ALL" ]; then
-        if [ -n "$IN_CHROOT" ]; then
-            remove_pkg_autodeps
-        fi
-        if [ -n "$sourcepkg" ]; then
-            remove_pkg_wrksrc
-        fi
-    fi
     if [ -n "$sourcepkg" ]; then
         remove_pkg $XBPS_CROSS_BUILD
     fi
@@ -535,7 +527,7 @@ fi
 
 check_build_requirements
 
-trap 'exit_func' INT TERM HUP
+trap 'exit_func' INT TERM
 
 #
 # Main switch.