Revert "Re-add crap"

This reverts commit 0d6b7d98338c7dee36e06a467746908f54f59ef6.
Revert "Revert "Re-add crap""

This reverts commit c0509d5d11e6de1d53a88a25093deea24a6bc8c4.
Delete crap again