Add clean up tasks
Updated documentation