fixed xml descriptor mappings
fixed uri issues"
"
removed unused imports