Revert "Warnings and static analyzer fixes"
Merge pull request #134 from project-imas/revert-130-warningsAndStaticAnalyzerFixes

Revert "Warnings and static analyzer fixes"