cleanup, edit options