remove optional fields. add partners select.