Remove toggling option from rw and yr commands.
Refactor SampleAndControl class.