Revert "Junk cleanup"

This reverts commit 4140e304c5b0cbb2b2de96b646ef2334653d9eb4.