Revert "New sweep2wake/doubletap2wake options"

This reverts commit 93114e97c761e9e1194a77ab0e8f2fa61f8f772e.