remove dead file, bad merge of changes