Cleanup and controller as