Revert: Revert: Static code analysis (bf08e9a) (dfe1b59)