I’d try starting with bho if you’re looking to save the terps. Heptane is tough to get rid of residual wise