A little cleanup after merge