Remove debug code.
Merge branch 'hotfix/remote_debug_code'