PLA-1385: cleanup