removing two files missed in merge