Removing more oracle references