cleaner store of groupings and lexicons
Removing some unneeded state