Merge "Remove n-cells, n-net and n-cauth"