removed another mergenote for related items

(already coverered by another JIRA issue)
tweak to meet coding guidelines an removed unused variable - SYSMO-1638