Remove one more goto