todo on remove logs (#123)