Remove the groupable.rs dependency