cleanup

Deleting some files accidentally created during the merge