Remove unused variables, force update