cleanup  for X86_64