Client|Map Renderer: Cleanup