Remove unneeded code from dax, use proper IRIs in xebr converter.