Revert "Massive commit 2"

This reverts commit 0a69388bb9d0ef6a459e25f557de78578f3f7540.