Cleanup.

Jira Issue: WP-955