group id update to be consistance with main project, some cleanup