Remove unused code found by CSA