Cleanup of P2P-Next: supporter of swift