Cleanup TODO comments