! Remove old unused code (fixes #2364)

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>
Merge pull request #2365 from Oldiesmann/release-2.1

! Remove old unused code (fixes #2364)