Add todo about cleanup