Removing the un-needed TODO