Removed some commented code.
Added set xml verification against schema