before removing old code
Transition to Lift completed
some refactoring