Cleanup add_tex/remove_tex usage