Remove unused line

+review REVIEW-5163
Moved a TODO into the design spec

+review REVIEW-5163