No comments; Merge conflict
Deleting xml files since we will be automating the whole process
.