More RC4 cleanup