Took out unnecessary TODO comments