initial of atomic rescue

cleanup of atomic rescue