Major refactoring for the new fork
Drop debugger leftovers