remove todos I did