Remove dead code
Use pkg_printf where possible