remove optional since it was unused