remove TODO comments that were done