removed TODO comments that have been completed