Controller Clean-up