Merge branch 'Remove unused fields in cpumap & devmap'