clean up
remove unused
extract main logic from broadcastService
fix bug in detecting shortStop