Remove debug code.
Add splitters.