Cleaning up at project level, except Simulation
Cleaning up simulation. This is a seprate commit because we might need to go back and look at what was in there.