Removed todo comment