Remove engine dependance.