- fixed remove function