Remove some not needed params from grouping