remove TODO comments