Removed a bunch of code, like a champ