remove preElaborateTransforms and clean up more