usecase coverage cleanup