diff --git a/src/bin/demo.rs b/src/bin/demo.rs
index a10a912..7da916e 100644
--- a/src/bin/demo.rs
+++ b/src/bin/demo.rs
@@ -1,15 +1,7 @@
-use deriv::Repl;
-use deriv::eval;
-
 fn main() -> std::io::Result<()> {
-	let eval = deriv::pipeline!(
-		eval::Normaliser::new(),
-		eval::Differentiator::new('x'),
-		eval::ConstFolder::new(),
-		eval::Simplifier::new(),
-		eval::ConstFolder::new(),
-		eval::Canonicaliser::new()
-	);
-	let mut repl = Repl::new(std::io::stdin(), std::io::stdout(), eval);
+	let mut repl = deriv::Repl::new(
+		std::io::stdin(),
+		std::io::stdout(),
+		deriv::evaluator('x'));
 	repl.run()
 }
diff --git a/src/lib.rs b/src/lib.rs
index b1737cb..aba424f 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -5,9 +5,7 @@ pub mod binding;
 pub mod read;
 pub mod eval;
 pub mod print;
-
 pub mod repl;
 
-pub use expression::Expression;
-pub use eval::Evaluator;
 pub use repl::Repl;
+pub use eval::evaluator;