Removing oracle references