remove unused constant
nicify p2p binding module a bit
remove unused function from nsi2 helper module
remove unused code from aggregator