cleaned up the plugin arch