Add clean up tasks TODO