remove changes made concerning std and cv