Remove old code that got added during merge.