Remove calls to redirect