Revert "Minor junk clearing"

This reverts commit 4e0861fa2e6b816a561b185a170d7db2b6623104.