Map Renderer: Cleanup