cleanup in option handling