Remove unused code and cleanup error message
Merge branch 'case-importer' into staging2