Another cleaning up of plugins and unnecessary files