Clean up and include grouper