Remove some plugins. Update Bundle to Plugin.