ML some merge cleanup