Remove dublicate code
Merge branch 'route-versions'