Consolidated some things in condensed phase simulation.