Cleanup for 2.1 release