Remove old stuff. Version increment for 2.1.7 release.