Remove TODO's that were already done