Map Renderer|Decoration|SurfaceDecorator|Surface|Client: Cleanup