Removing TODO items which have been fixed. Thanks, @HaraldWeber