I think this can be removed now as well (no difference in calls)