added remove pins but seems to be faulty