fixup! delete unnecessary conditional