Clean up redundancy in surrogate models and only encode in encode()
Cleanup externally sourced lib
DEPLOY THE REFACTOR HAMMER