Remove files when done and add comments