Clean up after hotfix to fix xml loading for import