Removing more unused plugins
Fixed merge