[Transformers] eh/cleanup1 removal