removed double call of use case functionality