nit: remove "name" here too