Revert unneeded change from the usage refactoring and remove two dead vars.