Remove converting to string