Further Modes cleanup