DONE: Add cleanup:

NOT DONE: Add in log check.
   - what log check did we want to add??