Cleaned up options.