Removed obsolet TODO