Revert "Warnings and static analyzer fixes"

Reverts project-imas/encrypted-core-data#130