add TODO, further cleanup