d710: more cleanup