d710: cleanup and update