Continue cleaning up code for experiment

- Move some code to expSet

- Delete old experiment code.