City watchdog sharpens focus on wind-down plans