performing some cleanup before 2.1.0 release