Merge "Clean up n-net remnants"