PL-190: clean up
Merge pull request #216 from anilsaldhana/master

PL-190: clean up