Map more fields to CPIMS
Revert "Map more fields to CPIMS"

This reverts commit 80ba01c81c4315389875e65851db42d3b495a501.