Removed the plugin bits