Remove redundant options.
Fixed some problems.