Groups ops modals. Fix to actually work. Clean some old stuff.