Remove lot's of debugging code for old distributions, and getting ready to run simulations