Some cleanup and removed some plugins