Merge "Remove unused old transition types" into main