Remove old engine legacy code