removed stuff only needed for my mrf_energy branch