Remove unnecessary code from debugger
Merge remote-tracking branch 'upstream/master'