Cleaning up transformers