Added expiry removal for pins