modified find & findBy callback function in remove and removeBy function