Added ServiceNet option & trap cleanup()