PLA-1641b code cleanup