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

Ready to Merge and Test but need server to be mindful of the changes.