Removing unused variables in PML drivers and extending TODO list.