refactoring: remove the need for PeriodicHandler