[BUG #7279] clean-up of old code, some re-org of existing, and some experimental
[BUG #7279] minor glitch