Gridmap|Data: Cleanup