Add option to disable/enable oss

Remove optimize option