Preserve Z scale
cleanup