Kompare Fixes to support refactoring
Country imports. Remove more audit prefixes