Fixed language issue
Fixed option name
Removed obsolete code