Revert "Lotta Changes"

This reverts commit 56a63d8b0fa0a81c8c781f26f08764f7705dcdca.