PLINK-130 cleanup and simplify sample schema, refactor to use new annotations