How To Drop Servers Normal Sp_dropserver Is Not Removeing The Listings When You Check Osql /L

Trying to clean up after installing several SQL servers on a server. Started by installing SQL2000 enterprise as a named instance. Then added a instalation of SQL2005 enterprise again as a named instance. Then renamed OS level Server / Computer name. Now want to rename the SQL Servers or drop and then re add.

Anyway a long story short I have searched many boards and tired a bunch of things but still I come back to How can I remove things that show up in the list when you use the osql /L command from a command prompt.

Here are several things I have either tried or checked with many different varaitions:

SELECT @@SERVERNAME

SELECT SERVERPROPERTY ('MachineName'), SERVERPROPERTY ('InstanceName')

sp_helpserver
go

sp_dropserver 'MachineNameInstanceName'
GO

sp_addserver 'MachineNameInstanceName', local
GO

DECLARE @srv sysname
SET @srv = CAST(SERVERPROPERTY('ServerName') AS sysname)
UPDATE sysjobs SET originating_server = @srv

If this is a target server (you have jobs sent from a master server), you have to exclude them, so you don't convert those jobs into local jobs:

WHERE originating_server = '<old_name>'