Removed a lot of stuff that wasn't actually necessary