Take NetAssess UID instead of ID; cleanup