Eliminate dead code found by scanner