Remove unused variable.
More toggle interface fixes.
merge changes from EFF