Merge pull request #1068 from TheBlueMatt/2021-09-ser-cleanup