removed unneded if-statement