Improve detection of UTF-8  support
Delete useless old Caldera-specific code