add exchanges, mutators, handler cleanup