work on remove grouowner customizations in order to align with develop