clean up and remove redirect string so we can use referral URL

DO NOT PULL YET