Issue #25: got rid of some TODO comments related to this issue
Issue #25: got rid of some TODO comments related to this issue

gift-surg/GIFT-Grab,gift-surg/GIFT-Grab,gift-surg/GIFT-Grab,gift-surg/GIFT-Grab