added remove following logic