Clean up references to LibiconvBuilder