Remove unused and not completely correct code

This stuff wasn't tested (EDIT: with the same tests as the rest of the system) and has diverged from reality, so it's time for it to go away.
Oh, and this is testing that registry's DeleteService was called with the correct ID.