Remove unused service class