Eliminate forward_batch.
cleanup