Remove line left in from debugging
Handle disabled flag for other exchange types