clean up for class ParameterSet