Cleanup use of selFKinds