PLINK-487: clean up
Merge pull request #328 from anilsaldhana/master

PLINK-487: clean up