UTF-8 final fix. Cleaning code.