Merge "init: clean up DelayService()" into main