fixing timers and unregister method

Jira-issue: WP-1226