More cleanup. No need to set the option, since they now have defaults available.