refactor: removal of unused variables everywhere