reverting to not call remove from disk on cleanup.