Trying to remove some merge junk