Add ToDo reminder
Remove deprecated comments