[modules] pbn cleanup