rc-dev: minor refactor track/Connect