Cleanup and debug following separation of mcnp calls