Merge pull request #1045 from Arantor/release-2.1

More cleanup of things we're not using any more