Revert "modify for the n6 always listening feature"

This reverts commit 10882348431400d7b3050b9cb65745cde4f3befc.
clean this up