Removed unnecessary if.
Fixed typos.
Disabling benchmark until jerkins scripts are updated.