Cleaned up MapRenderClient