clean up and spruce up Optional
remove unused code
remove unused override
update README