Cleaning up remaining tax calls that should polygon lib calls...