Transitions: more cleanup