Removed all references to the old service