Remove genealogy from the Mac build and add further refinements

Per comment