Change to tensor form.
Removed an old variable.