Test disconnect only

Update disconnect handler to ignore content and legacy categories. Let's see what breaks.