Removed code that was put into a Service subclass (where it really belongs).