Revert "Clean up cruft"

This reverts commit 6431b026a6948c2c36739bff9d31f5a2a1dfbd4d.
Clean up cruft for real