clean up ko and adv relation and remove dead branch - can only be consistent if people are deliberately fiddling with internals (and should not test for that)