clean up options some more