Removed TODOs and XSD cleanup