hncp-03: more cleanups, still not done