Remove code after bad merge.