remove all unicode_literals
revert package name change in extras, be consisten with other places