Removed a bunch of plugins and a few small changes