Commented out map code and some client-specific code