cleanup and standardize extra schemas