Remove redundant code

Jira issue: WP-956