Remove ObjectData class