clean up for the release of 2.1.0