Fix `self` usage in later iterations of pipeline2.
Pipe unit tests passing again. Drop clone-function.