Merge branch '2021-09-24-assorted-minor-updates'

- Assorted bugfixes, MAINTAINER updates and dead code removal