Remove obsolete conditions