Revert "Junk deletion vol 2, hopefully better this time"

This reverts commit 8b2b33d74503a685e5d1faec0d27ba36cf997f22.