Fix removal of syncing vs. completed handler