Remove the glue from 2D to generalized (for now)