Fixed xml strings
Deleted unused file and string
Fixed several lint warnings