removed useless options
fixed incedentally commited bug