Removed a bunch of things I am not currently using