remove unused service
Merge branch 'refacroring'