cleanup: remove unused variables