cleanup -Wall and City types (not used yet)