* Refactoring of Group Use cleanup, misc cleanup