[PLINK-553] - Code cleanup.