Clean up obsolete workarounds for P.O.Box formatting