Need to remove this logic. We're not really using it.