grouping and config removal out from the code