Cleanup TODO comments

Update TODO comments