Modifications to simulations and modules, started removing old code from main files.