removed dup debuglog merge cleanup