Clean up comments

Jira issue: WP-773