Did some cleanup for final package release 2.0