Remove diagnostics server stuff completely