Remove remove_querystring function altogether.