clean up more successfully?