Remove all ID-dependence except for getData()