hncp-03: more cleanups and adjustments