Clean up the repo and validation generics.