Improve loggiing, add file deletions