removed unused if-statement