Kill utils we aren't using.
Refactor into modular components.
More refactoring.