Merge "Remove unused and outdated debug code." into experimental