mark TODO and clean