Clean up controller