ncm-gip2: code simplification/cleanup