Removed unused plugins.
Minor fixes
Merge branch 'cleaning'