Clean up options some