Removed surplus condition