final set up of 2.2 cleanup fixes
cleanup
cleanup