1125035 - Removed some more no-longer-relevant TODO comments