Cleanup, mark TODO's