BROKEN Clean up refactoring just enough to compile