undo group stuff, next will use scaffold