final 2.2 cleanup