Remove upstream (helper) exchange type on disable, strip unused/comments