More transform cleanup