As GWAS studies grow larger and more inclusive, guidance on how best to perform GWAS in highly diverse samples is needed. Here we outline a strategy for empirically assigning samples to more homogenous ancestry groups based on reference populations. This approach minimizes overall sample and marker loss and reduces within group genetic variance with the potential to increase discovery and replication power without increased inflation due to population stratification.