Remove the unicode from here as well