Forgot to remove some now unused variables