This fixes a merge resolution from master to the branch. It also removes unused variables, from a previous change.