more cleanup, subscribe in set still not done