cleanup + include full snmp API