remove dead code and channels, which got replaced by signals