Removed make plugins (removes templates???)