Removed uses of DBObject