remove occurences of org.hibernate.type.PrimitiveType
remove occurences of org.hibernate.type.KeyValue