Remove obsolete builder code.
NormalizedOrder encapsulated.