Code cleanup for 2.1 release