final clean up #2
Jira-issue: WP-1244