Redirect is handled in 1 location, start of JS clean-up, #20