PLA-1302: cleanup