still making sure the working copy is cleaned up