Cleanup.
Added Controller
Added ClusterSweeper