Simplify engine completion logic