Clean up FileNameOptionStorage implementation