Remove some unneeded channel closing