added remove logic