removed some unnecessary plugins and some cleanups