Remove old faulty mode checking