Started to remove top-level group functionality
completed group removal