Removed old engine-code