! A few more tweaks related to moving topics...

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>
! Remove extraneous code.

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

! More tweaks related to moving topics