Revert introduction of ApiModifyClaim

ApiModifyClaim and how it's used is abuse of inheritance that introduces many problems

This partially reverts commit e60f6cad52ce2568be01214c32fa959a8c6d5a98

Change-Id: Iac13cf92a5160e996e146afc6d7c5834944340d4