Massive refactoring. Removing references to spire.