Extract handlers, remove redundant channels