Remove unnecessary redirects