Cleanup group-A unity project

merged issues into main project