More cleanup

Some more changes of stuff only working for a previous experiment at a
different sampling rate