Remove non-necessary parameters for the client