Cleaning up controller