Forgot to remove unused variables