diff --git a/core/DebugReporter.cpp b/core/DebugReporter.cpp
index d86fa111..ed8a6bd2 100644
--- a/core/DebugReporter.cpp
+++ b/core/DebugReporter.cpp
@@ -36,11 +36,6 @@
 
 DebugReport g_DbgReporter;
 
-/* I'm really lazy.  This should probably be exported to ISourcePawnEngine someday,
- * but we need to make sure the JIT will deal with the version bump.
- */
-extern const char *GetSourcePawnErrorMessage(int error);
-
 void DebugReport::OnSourceModAllInitialized()
 {
 	g_pSourcePawn->SetDebugListener(this);
@@ -56,7 +51,7 @@ void DebugReport::GenerateError(IPluginContext *ctx, cell_t func_idx, int err, c
 	va_end(ap);
 
 	const char *plname = g_PluginSys.FindPluginByContext(ctx->GetContext())->GetFilename();
-	const char *error = GetSourcePawnErrorMessage(err);
+	const char *error = g_pSourcePawn2->GetErrorString(err);
 
 	if (error)
 	{
@@ -91,7 +86,7 @@ void DebugReport::GenerateCodeError(IPluginContext *pContext, uint32_t code_addr
 	va_end(ap);
 
 	const char *plname = g_PluginSys.FindPluginByContext(pContext->GetContext())->GetFilename();
-	const char *error = GetSourcePawnErrorMessage(err);
+	const char *error = g_pSourcePawn2->GetErrorString(err);
 
 	if (error)
 	{
diff --git a/core/sm_globals.h b/core/sm_globals.h
index d7352e64..8165a1f6 100644
--- a/core/sm_globals.h
+++ b/core/sm_globals.h
@@ -174,7 +174,6 @@ private:
 
 extern ISourcePawnEngine *g_pSourcePawn;
 extern ISourcePawnEngine2 *g_pSourcePawn2;
-extern IVirtualMachine *g_pVM;
 extern IdentityToken_t *g_pCoreIdent;
 
 #include "sm_autonatives.h"
diff --git a/core/sourcemod.cpp b/core/sourcemod.cpp
index 81163a95..9c3dafc0 100644
--- a/core/sourcemod.cpp
+++ b/core/sourcemod.cpp
@@ -590,7 +590,7 @@ ISourcePawnEngine *SourceModBase::GetScriptingEngine()
 
 IVirtualMachine *SourceModBase::GetScriptingVM()
 {
-	return g_pVM;
+	return NULL;
 }
 
 void SourceModBase::AllPluginsLoaded()
diff --git a/public/ISourceMod.h b/public/ISourceMod.h
index 80fa1d05..e9ec4ac9 100644
--- a/public/ISourceMod.h
+++ b/public/ISourceMod.h
@@ -203,9 +203,9 @@ namespace SourceMod
 		virtual SourcePawn::ISourcePawnEngine *GetScriptingEngine() =0;
 
 		/**
-		 * @brief Returns the JIT interface.
+		 * @brief Deprecated, do not use.
 		 *
-		 * @return			A pointer to the JIT interface.
+		 * @return			NULL.
 		 */
 		virtual SourcePawn::IVirtualMachine *GetScriptingVM() =0;