further cleanup/removal of 'Optional.'