Removed obsolete todos