Transition cleanup