PLFENG-1805 : Cleanup commits