PLA-1272 removing unused code