don't mess the unsubs in test
remove dead code