Remove some output that is not required and add some ordering of channels