PLFENG-1968: cleanup source code