Removed obsolute TODO reminders