Upgrade library to OpenCNAM API v2. Remove cruft.