[PATCH] NetConfig: More cleanup