removed unused if clause