PLF-4468 : Cleanup comments