Transform cleanup