got rid of some TODO comments