removed some plugins
lots of changes