Debugger cleanup

Some initial cleanup.