remove some TODO comments