Remove redirects
Fix specs