Removed a bunch of unnecessary stuff