Removed return redirects