Removed a lot of stuff that wasn't being used!