Consolidated some channel closing