Cleaning up application controller