Windows cleanup handling

Jira Issue:WP-1251