Drop optional params from url before redirect

In lieu of extremely complex solutions, which burned a ton of time.