ROADMAP-1091 #code cleanup