Refactor a bit - remove DataGroup and the group concept in o.a.c.u.memory and remove some dead code.
fix potential deadlock