Cleanup.  Sim test code out of pid