default logic removed