Merge "Cleanup API version schema"