Add pipe2eval. Cleanup