Remove the redirect nonsense. May need to be refactored