Revert "Cleanup!"

This reverts commit 4f7afcabb5b132871f7117a3061f8baf12e4e9d6.
Everything Works again!

I should really stop touching things now and get back to fixing the
code.