XML import cleanup