Map Renderer|SurfaceDecorator|Client: Cleanup