changed removal method