Removed a few TODO reminders that have already been resolved