change name and remove some things