xxx: remove redirection