need to fix remove