Cleans up patterns; moves some to beat-mode