Clean up of controllers