Removed All references to the Spout class execpt EngineFaker