cleanup after refactoring for p2p service