Some 2.2 cleanup