Remove unused code after merge.