Add remove buddy functionality