Here's a patch which does three things:

(1) It removes some dead code.
(2) It moves more code to using the new state machine
(3) It fixes a long standing bug relating to the sense data for a detached
    device.