cleaning up code for a 2.1 release