Added remove for driver