[CR fixes] remove code unnecessary wrapper