Remove TODO comments as it has been done