Remove unused imports
Remove cluttering code
Improve Optional examples