BK-1045 Remove json_wrapper from the code