Remove traces of channel locking code until that code is ready to be merged into stage again