Remove troublesome params