Removing TODO as the items have been turned into tickets now.