Clean snmp model construct. closes #2494 too