remove TODO: doing it didn't work well