Removing TODO from BeneficiadoraService