More testing. This code cleanup session supported by @Zorg1.