Setup diagnostic order, remove echo order