engines: cleanup