Remove Str dependency