Added boolean to removing user
Added returning location choices