removed code which is not message converters related