[CLEANUP] Core has a XML syntax dependency on templavoila