some cleanups, get repeater to exit cleanly