Adds cities logic
Removes location from events