Cleanup for 2.2.