Remove unneeded concommand call during mode switch