more transformation estimation cleanups