1370 Removed a TODO for something we don't want