Remove TODO comments