removing round-trip code