Remove the last bits of Spout from our code.