Removed unused stuff from pipe spouts