Minor refactoring
Refacotring how we are dealing with async index reset during startups