Revert 2c2f2ba..2b020db

This rolls back to commit 2c2f2ba245976f6d1e217e3a74d22b265027b2aa.
Cleaned up a lot