ROADMAP-1091 #more code cleanup