Cleanup; change to use multiple services