more cleanup after merge