Remove worker ping + rearrange some logic

In progress and not ready for merging yet.