Removed pointless if