Merge "Clean up debugger"