Separation of plugins

Removed some logic to have it dealt with by other plugins.