Map|Client: Cleanup