Removed outdated @TODO comment