Removal of Spout Class Referecneces Attempt 2.

...nt side works

Waterpicker Waterpicker@rocketmail.com