Removed dependency on certificate handler

Jira Issue: WP-889