Modify date in header.
Make sure the directory is deleted.
Clean code and remove comment.
Merge pull request #1254 from jburel/submit-followup

Submit followup