Cleanup for 2.2 release