remove locking in state and city