Clean the useless parameter that will not be needed for V2