Fix some error
Remove old USpan func