Removed some TODO comments that were clarified