Removed some merge leftovers