First pass at removing Spout references.