Removing logging and update category grouping