diff --git a/vpi/sys_finish.c b/vpi/sys_finish.c
index 339cf4a13..3439426a5 100644
--- a/vpi/sys_finish.c
+++ b/vpi/sys_finish.c
@@ -17,15 +17,14 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #if !defined(WINNT)
-#ident "$Id: sys_finish.c,v 1.1 1999/08/15 01:23:56 steve Exp $"
+#ident "$Id: sys_finish.c,v 1.2 1999/08/19 02:51:03 steve Exp $"
 #endif
 
 # include  "vpi_user.h"
-# include  "veriuser.h"
 
 static int sys_finish_calltf(char *xx)
 {
-      tf_dofinish();
+      vpi_sim_control(vpiReset, 0);
       return 0;
 }
 
@@ -43,6 +42,9 @@ void sys_finish_register()
 
 /*
  * $Log: sys_finish.c,v $
+ * Revision 1.2  1999/08/19 02:51:03  steve
+ *  Add vpi_sim_control
+ *
  * Revision 1.1  1999/08/15 01:23:56  steve
  *  Convert vvm to implement system tasks with vpi.
  *
diff --git a/vpi/veriuser.h b/vpi/veriuser.h
deleted file mode 100644
index 4bcbe30b9..000000000
--- a/vpi/veriuser.h
+++ /dev/null
@@ -1,47 +0,0 @@
-#ifndef __veriuser_H
-#define __veriuser_H
-/*
- * Copyright (c) 1999 Stephen Williams (steve@icarus.com)
- *
- *    This source code is free software; you can redistribute it
- *    and/or modify it in source code form under the terms of the GNU
- *    General Public License as published by the Free Software
- *    Foundation; either version 2 of the License, or (at your option)
- *    any later version.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU General Public License for more details.
- *
- *    You should have received a copy of the GNU General Public License
- *    along with this program; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-#if !defined(WINNT)
-#ident "$Id: veriuser.h,v 1.1 1999/08/15 01:23:56 steve Exp $"
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * This header file only exists as a stub, and to carry the function
- * declaration for the tf_dofinish() function. I plan on removing both
- * as soon as a VPI way of doing this appears.
- */
-
-extern void tf_dofinish();
-
-#ifdef __cplusplus
-}
-#endif
-
-/*
- * $Log: veriuser.h,v $
- * Revision 1.1  1999/08/15 01:23:56  steve
- *  Convert vvm to implement system tasks with vpi.
- *
- */
-#endif
diff --git a/vpi/vpi_user.h b/vpi/vpi_user.h
index 8a44b9f9d..f9061ecd9 100644
--- a/vpi/vpi_user.h
+++ b/vpi/vpi_user.h
@@ -19,7 +19,7 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #if !defined(WINNT)
-#ident "$Id: vpi_user.h,v 1.2 1999/08/18 03:44:49 steve Exp $"
+#ident "$Id: vpi_user.h,v 1.3 1999/08/19 02:51:03 steve Exp $"
 #endif
 
 #ifdef __cplusplus
@@ -135,7 +135,7 @@ extern void vpi_printf(const char*fmt, ...);
  * vpiReset -
  * vpiSetInteractiveScope -
  */
-extern int  vpi_sim_control(int operation, ...);
+extern void vpi_sim_control(int operation, ...);
 #define vpiStop 1
 #define vpiFinish 2
 #define vpiReset  3
@@ -161,6 +161,9 @@ extern void (*vlog_startup_routines[])();
 
 /*
  * $Log: vpi_user.h,v $
+ * Revision 1.3  1999/08/19 02:51:03  steve
+ *  Add vpi_sim_control
+ *
  * Revision 1.2  1999/08/18 03:44:49  steve
  *  declare vou_sim_control
  *
diff --git a/vvm/vvm_calltf.cc b/vvm/vvm_calltf.cc
index 243f71f36..56b2663a8 100644
--- a/vvm/vvm_calltf.cc
+++ b/vvm/vvm_calltf.cc
@@ -17,7 +17,7 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #if !defined(WINNT)
-#ident "$Id: vvm_calltf.cc,v 1.3 1999/08/15 01:23:56 steve Exp $"
+#ident "$Id: vvm_calltf.cc,v 1.4 1999/08/19 02:51:11 steve Exp $"
 #endif
 
 # include  "vvm_calltf.h"
@@ -70,9 +70,13 @@ extern "C" void vpi_printf(const char*fmt, ...)
       va_end(ap);
 }
 
-extern "C" void tf_dofinish()
+extern "C" void vpi_sim_control(int func, ...)
 {
-      vpi_sim->s_finish();
+      switch (func) {
+	  case vpiFinish:
+	    vpi_sim->s_finish();
+	    break;
+      }
 }
 
 extern "C" vpiHandle vpi_handle(int type, vpiHandle ref)
@@ -469,6 +473,9 @@ void vvm_calltask(vvm_simulation*sim, const string&fname,
 
 /*
  * $Log: vvm_calltf.cc,v $
+ * Revision 1.4  1999/08/19 02:51:11  steve
+ *  Add vpi_sim_control
+ *
  * Revision 1.3  1999/08/15 01:23:56  steve
  *  Convert vvm to implement system tasks with vpi.
  *