Reverted silly changes (ready for release!)

Undid some silly changes