Forgot to remove some old, unused variables