additional cleanup and merge