refactored/removed plugins