remove attempt to cleanup spire references: using abbreviations instead