fix unMake & add rm fn