Omit Deadline field if deadline not defined