Cleanup

Jira Issue: WP-528