pattern cleanup + 2 new patterns
Revert "pattern cleanup + 2 new patterns"

This reverts commit b2dd11bf1c9077d8dc873eb4fb26ab0323de461e.