Remove Channel dependency