Took out unnecessary TODO