code cleanup after unicode issue