The main goal here is to reduce complexity. For example, the method to remove a parameter from the current URL is never used with another parameter. The complexity is not needed. This is inspired by the changes I have seen in Icaf086f. Change-Id: If22c25e84f50ac380320cd581690835ddb70f01d