Revert "Massive Commit"

This reverts commit 67a89875fcea999e37b642bc014ef0ceabe81e82.