new modes system
cleanup for the new modes