Cleanup references to old space classes