Cleaned up a bunch of dead code from drive list.