Revert "Adding a separate state for QuickScrub"

This reverts commit 6c6c2f45f77d9e577143e16f7eef21ed98aa6367.

Reason for revert: Temporary revert for build.

Change-Id: I3947e9b2d4e5788f9d2a0c4e2e8b7d425d5bc775
13 files changed