Removing default values from the client