AVALANCHE: Remove dead code reported by CppCheck