Sync is broken if a repo is deleted and required branches were tracked

[galargh]

The sync seems to break on refresh in such a scenario. I suspect we're not cleaning up state correctly.