removed unnessery condition