Debugger cleanup

Some initial cleanup.
This is safe to remove?