clean up of options