Manual removal of files missed in upstream merging