[Matahari] [PATCH] schema.xml cleanup