Add back Grouper and cleanup Maguro