Cleanup for security - improve ImportEDMS