Removing redirects
Merge branch 'dev'