removed superflous if