Removed 2 non-existing conditions