cleaning up code for 2.1 release