Add missing synchronization

To 2 places where channels can be removed, not just marked as deleted.

Also rename a variable to remove an extraneous s.

Test: manual
Change-Id: Ic7f676499425fe54453384d7c03de5d95c03a713
Fixes: 113036956