Cleaned up old TODO comments that have been done