Revert "fixed sonar errors in AccountEntityFacade"

This reverts commit ce42259a7d7210d50459efcd7b1c7bdf2ad01614.
Fixed errors in sonar
Merge branch 'fix_branch'