Removing TODO in favor of issue