d710: keyfiles cleanup