cleanup
add to city to users db
add city in users