More cleanup from touch_wake