cleanup for 2.2.D2

3 files changed