stop using Options class