Adding the agent plugin and remove some leftovers not needed anymore.