cleanup and manual controller