put unused but useful fields back as optional