Remove selectingAddress and selectingName