Clean up code to prepare for official 2.1.0 release