Removed obsolete conditions