Clean up utf output handler even more