Removed TODO
Removing TODO