Charles Lacy Veach before his death

[ZachS09]

I'm crafting a Word document that lists all astronauts by how much time they spent in space, and marked certain people who died while serving in the astronaut corps (i.e. the Challenger crew).

But one thing that's confusing me was Charles Lacy Veach's death due to skin cancer in October 1995. His last Shuttle flight, STS-52, ended in November 1992; and he worked on the ISS robotics program in the meantime until he died.

My question is: did Veach leave the astronaut corps before working on the ISS robotics program?