Delete some dead code
Merge remote-tracking branch 'origin/4.7' into 4.7-gdb-all