Removing references to spipe