[MAT-355] remove std namespace import, patch up.