First pass of cleanup.
Ore refactor complete.