Fix project group, cleanup