Some soy cleanup
Fixes #48.