Clean up definition.xml