You are correct on the trans fluid change.

Dump it, new filter and re-fill with new fluid.