Touched up removal code in drv_gen.c
Added missing probes, corrected parts of removal code.