Automorphisms removal (work-in-progress)