Cleanup Context Model xsd schema and bean translator