cleaning up and ensuring no version schema offenders