Removed merge leftovers.