WFLY-1701 refactoring to remove redundand service