Revert "Adding selected state for scrubber control"

This reverts commit a11aeeb36560959db321f9757d4c5eccfdfa7f63
16 files changed