More post merge cleanup