transitionTo is deprecated and some other cleanup