PLA-1272 clean up