Cleanup, preparing for Xe simulations