purple merge cleanup