switched to main and control
cleanup