Removed SafeExit stuff from pd for testing.