Fix bug recently introduced in remote debugging
Remove unused method
Fix yet another issue recently in remote debugging