Revert "General Cleanup"

This reverts commit 6d5b0f67a6bc5a051d81ff3ca97bf640169cbf3a.