Remove test uses of optimize force flag.