Revert "Map more fields to CPIMS"

This reverts commit 6b73c87f7a975200c69ca7e099b967f6f495cf82.