Comment out TODO which has been done