Cleaning up City Hall

Cleaning up City Hall