Superfluous MOC calls have been removed