Refactoring to support My in GoalService
Removing PaymentService