a bit more cleanup - no functional change
interim checkin
continuing cleanup