removed unused conditional