Further Merge cleanup