Merge pull request #1627 from Oldiesmann/release-2.1

! Remove old code (fixes #1621)