Got rid of CIDOC includes