*8566* Clean up import/export handling; clean out dead code