PLA-1641 cleanup