General cleanup, including start/stop behavior