*Transition interface removed
*Some clean up