+merge cleanup