Took out the --clock and --exp-mass options (cleaning up)