Remove optimism
Cure warnings.