another small cleanup: remove unused variables