Revert "Mms: Cleanup CAF additions"

This reverts commit 4a6182bbc2699883af86000a5e28dfc6215e6470.