Remove unused code that was inserted after merge.