Remove Spout support