merge cleanup stuff