removed an unused variable, other various cleanups