Removed a leftover file from merge.