better remove logic