Fix timer stop
cleanup, tested that subscriptions work with other clients