PLA-1305 more clean up