removed unused if