Spout support  cleanup