Charset fix: Removed code added for testing