Merge "Remove unused, obsolete debug code" into jb-dev