Skip cleanup doesn't seem to be working, so just going back to the old way