clean up controller