Remove the use of offering from split.

WIP: not all tests have been fixed yet.