Cleanup in controller