Removed all but one reference to the Spout class