Clean up code
Add task to add/remove plugins