Minor, remove unused variables