Remove even more old code
unicode_literals stuff and a related fix