Refactor: no aircraft types, no engine objs