Fixing dependencies.
Removing all references to SA2B's model format.
Committed to soon.