Change Bundle to Plugin and remove some plugins