removing some old options that are no longer used; adding new 'final