RFC: Simplify engine