Fix 1.6.1 mappings and removed PK mappings from 1.6.2 mcp2num