Time based policies: code cleanup.

Jira issue: WP-1144