Driver core: Remove unneeded routines from driver core