better remove and logging