Remove Arguments and use only ParameterSet