cleanup references
WIP BrokerRawConnection, start/stop is not working as expected yet :(